Combine `ty::Projection` and `ty::Opaque` into `ty::Alias` #104986

compiler-errors · 2022-11-27T17:27:24Z

This PR consolidates ty::Projection and ty::Opaque into a single ty::Alias, with an AliasKind and AliasTy type (renamed from ty::ProjectionTy, which is the inner data of ty::Projection) defined as so:

enum AliasKind {
  Projection,
  Opaque,
}

struct AliasTy<'tcx> {
  def_id: DefId,
  substs: SubstsRef<'tcx>,
}

Since we don't have access to TyCtxt in type flags computation, and because repeatedly calling DefKind on the def-id is expensive, these two types are distinguished with ty::AliasKind, conveniently glob-imported into ty::{Projection, Opaque}. For example:

  match ty.kind() {
-   ty::Opaque(..) => 
+   ty::Alias(ty::Opaque, ..) => {}
    _ => {}
  }

This PR also consolidates match arms that treated ty::Opaque and ty::Projection identically.

r? @ghost

cjgillot

I wonder what are the next steps. Can this be used to integrate in-trait opaques as a variant of AliasKind?

compiler/rustc_hir_typeck/src/cast.rs

compiler/rustc_infer/src/infer/error_reporting/mod.rs

compiler/rustc_infer/src/infer/freshen.rs

compiler/rustc_infer/src/infer/opaque_types.rs

compiler/rustc_symbol_mangling/src/legacy.rs

compiler/rustc_traits/src/chalk/lowering.rs

compiler/rustc_type_ir/src/sty.rs

bors · 2022-11-28T17:23:20Z

☔ The latest upstream changes (presumably #105008) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot · 2022-12-06T03:38:09Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

compiler-errors · 2022-12-06T03:38:12Z

I think this is ready

r? types

bors · 2022-12-06T10:14:13Z

☔ The latest upstream changes (presumably #105348) made this pull request unmergeable. Please resolve the merge conflicts.

oli-obk

r=me with some nits and a clean perf run

compiler/rustc_hir_analysis/src/check/mod.rs

compiler/rustc_middle/src/ty/fast_reject.rs

compiler/rustc_trait_selection/src/traits/project.rs

oli-obk · 2022-12-13T15:31:57Z

@bors p=1 bitrotty

bors · 2022-12-13T18:51:08Z

⌛ Trying commit 99417d5 with merge ad35b8e377db9f8fa1364750ed99d283bc52b2f2...

bors · 2022-12-13T21:31:31Z

☀️ Try build successful - checks-actions
Build commit: ad35b8e377db9f8fa1364750ed99d283bc52b2f2 (ad35b8e377db9f8fa1364750ed99d283bc52b2f2)

rust-timer · 2022-12-13T22:50:33Z

Finished benchmarking commit (ad35b8e377db9f8fa1364750ed99d283bc52b2f2): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.1%	[1.0%, 1.1%]	2
Regressions ❌ (secondary)	2.1%	[0.9%, 2.7%]	7
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.1%	[1.0%, 1.1%]	2

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.2%	[-2.2%, -2.2%]	1
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

compiler-errors · 2022-12-13T22:53:25Z

This looks like the same exact noisy crates that we saw in #105350 (comment)

oli-obk · 2022-12-13T23:37:18Z

@bors r+

bors · 2022-12-13T23:37:20Z

📌 Commit 99417d5 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2022-12-14T01:19:27Z

⌛ Testing commit 99417d5 with merge 918d0ac...

bors · 2022-12-14T03:59:57Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 918d0ac to master...

rust-timer · 2022-12-14T05:18:31Z

Finished benchmarking commit (918d0ac): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	3.6%	[3.3%, 3.9%]	2
Regressions ❌ (secondary)	1.6%	[1.6%, 1.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.6%	[3.3%, 3.9%]	2

Cycles

This benchmark run did not return any relevant results for this metric.

This commit fixes compilation errors but not runtime ones. Related changes: rust-lang/rust#104986 rust-lang/rust#105657 rust-lang/rust#105603 rust-lang/rust#105613

Upgrade our toolchain to `nightly-2023-01-23`. The changes here are related to the following changes: - rust-lang/rust#104986 - rust-lang/rust#105657 - rust-lang/rust#105603 - rust-lang/rust#105613 - rust-lang/rust#105977 - rust-lang/rust#104645

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Nov 27, 2022

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the opaques branch 3 times, most recently from 9892bfb to ffa4220 Compare November 27, 2022 18:24

This comment has been minimized.

Sign in to view

cjgillot reviewed Nov 27, 2022

View reviewed changes

rust-cloud-vms bot force-pushed the opaques branch from ffa4220 to c9a7fa8 Compare December 6, 2022 03:37

compiler-errors marked this pull request as ready for review December 6, 2022 03:38

rustbot assigned spastorino Dec 6, 2022

rust-cloud-vms bot force-pushed the opaques branch from c9a7fa8 to c0ab50e Compare December 6, 2022 03:39

This comment has been minimized.

Sign in to view

rust-cloud-vms bot force-pushed the opaques branch from c0ab50e to fe4fc29 Compare December 6, 2022 05:43

oli-obk requested changes Dec 13, 2022

View reviewed changes

compiler-errors added 9 commits December 13, 2022 17:27

make Opaque have one field: OpaqueTy

918ede6

Use ty::OpaqueTy everywhere

7f3af72

ProjectionTy.item_def_id -> ProjectionTy.def_id

5c6afb8

squash OpaqueTy and ProjectionTy into AliasTy

c13bd83

Combine projection and opaque into alias

61adaf8

Combine identical alias arms

96cb18e

Combine OfOpaque and OfProjection

4b19a2c

nit: docs

0f9e414

Remove chalk lowering for AliasTy

7196973

This comment has been minimized.

Sign in to view

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Dec 13, 2022

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 13, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 14, 2022

bors merged commit 918d0ac into rust-lang:master Dec 14, 2022

rustbot added this to the 1.68.0 milestone Dec 14, 2022

rustbot removed the perf-regression Performance regression. label Dec 14, 2022

xFrednet mentioned this pull request Dec 14, 2022

Bump rust nightly -> 2022-12-15 rust-marker/marker#55

Closed

compiler-errors mentioned this pull request Jan 16, 2023

Unify Opaque/Projection handling in region outlives code #106829

Merged

celinval mentioned this pull request Jan 24, 2023

Upgrade toolchain to nightly-2023-01-23 model-checking/kani#2149

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Combine `ty::Projection` and `ty::Opaque` into `ty::Alias` #104986

Combine `ty::Projection` and `ty::Opaque` into `ty::Alias` #104986

compiler-errors commented Nov 27, 2022 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

cjgillot left a comment

bors commented Nov 28, 2022

rustbot commented Dec 6, 2022

compiler-errors commented Dec 6, 2022

This comment has been minimized.

bors commented Dec 6, 2022

oli-obk left a comment

oli-obk commented Dec 13, 2022

bors commented Dec 13, 2022

bors commented Dec 13, 2022

This comment has been minimized.

rust-timer commented Dec 13, 2022

compiler-errors commented Dec 13, 2022

oli-obk commented Dec 13, 2022

bors commented Dec 13, 2022

bors commented Dec 14, 2022

bors commented Dec 14, 2022

rust-timer commented Dec 14, 2022

Combine ty::Projection and ty::Opaque into ty::Alias #104986

Combine ty::Projection and ty::Opaque into ty::Alias #104986

Conversation

compiler-errors commented Nov 27, 2022 • edited Loading

This comment has been minimized.

This comment has been minimized.

cjgillot left a comment

Choose a reason for hiding this comment

bors commented Nov 28, 2022

rustbot commented Dec 6, 2022

compiler-errors commented Dec 6, 2022

This comment has been minimized.

bors commented Dec 6, 2022

oli-obk left a comment

Choose a reason for hiding this comment

oli-obk commented Dec 13, 2022

bors commented Dec 13, 2022

bors commented Dec 13, 2022

This comment has been minimized.

rust-timer commented Dec 13, 2022

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

compiler-errors commented Dec 13, 2022

oli-obk commented Dec 13, 2022

bors commented Dec 13, 2022

bors commented Dec 14, 2022

bors commented Dec 14, 2022

rust-timer commented Dec 14, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Combine `ty::Projection` and `ty::Opaque` into `ty::Alias` #104986

Combine `ty::Projection` and `ty::Opaque` into `ty::Alias` #104986

compiler-errors commented Nov 27, 2022 •

edited

Loading